gail.c s/gtk_type_class/g_type_class_ref/

2008-06-17  Michael Natterer  <mitch@imendio.com>

	* gail.c
	* gailtoplevel.c: s/gtk_type_class/g_type_class_ref/

	* Makefile.am: add GDK_DISABLE_DEPRECATED to CPPFLAGS.

svn path=/trunk/; revision=20437

diff --git a/modules/other/gail/ChangeLog b/modules/other/gail/ChangeLog
index 8dc252ff80504af992d71c2f6d34c8bd1dc64cc6..0c064d8380eeb74e502bad5999df1845b5a4d8a4 100644 (file)
--- a/modules/other/gail/ChangeLog
+++ b/modules/other/gail/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-17  Michael Natterer  <mitch@imendio.com>
+
+       * gail.c
+       * gailtoplevel.c: s/gtk_type_class/g_type_class_ref/
+
+       * Makefile.am: add GDK_DISABLE_DEPRECATED to CPPFLAGS.
+
 2008-06-10  Li Yuan  <li.yuan@sun.com>
 
        * gailtextview.c: (gail_text_view_set_caret_offset):

diff --git a/modules/other/gail/Makefile.am b/modules/other/gail/Makefile.am
index 75256c7ca6620cf3700ac4a69092b4d55dbe349e..00a18fc0ab0caf32f9fadcbd97f000fbb68ebe24 100644 (file)
--- a/modules/other/gail/Makefile.am
+++ b/modules/other/gail/Makefile.am
@@ -138,15 +138,16 @@ libgailinclude_HEADERS =          \
        $(gail_public_h_sources)
 
 libgail_la_CPPFLAGS = \
-       -I$(top_srcdir)         \
+       -I$(top_srcdir)                 \
        -I$(top_srcdir)/modules/other   \
-       -I$(top_srcdir)/gdk     \
-       -I$(top_builddir)/gdk   \
-       -I$(top_srcdir)/gtk     \
-       -I$(top_builddir)/gtk   \
-       -DGTK_VERSION=\"$(GTK_VERSION)\"        \
+       -I$(top_srcdir)/gdk             \
+       -I$(top_builddir)/gdk           \
+       -I$(top_srcdir)/gtk             \
+       -I$(top_builddir)/gtk           \
+       -DGTK_VERSION=\"$(GTK_VERSION)\"\
+       -DGDK_DISABLE_DEPRECATED        \
        $(AM_CPPFLAGS)
-       
+
 libgail_la_CFLAGS = \
        $(GTK_DEP_CFLAGS)       \
        $(GTK_DEBUG_FLAGS)      \

diff --git a/modules/other/gail/gail.c b/modules/other/gail/gail.c
index 66055607d8749b014d5bc3addcec6c476f1c595f..da25873dea2bc1474f28c5b89014f3ed720762a1 100644 (file)
--- a/modules/other/gail/gail.c
+++ b/modules/other/gail/gail.c
@@ -711,10 +711,10 @@ gail_focus_tracker_init (void)
       /*
        * We cannot be sure that the classes exist so we make sure that they do.
        */
-      gtk_type_class (GTK_TYPE_WIDGET);
-      gtk_type_class (GTK_TYPE_ITEM);
-      gtk_type_class (GTK_TYPE_MENU_SHELL);
-      gtk_type_class (GTK_TYPE_NOTEBOOK);
+      g_type_class_ref (GTK_TYPE_WIDGET);
+      g_type_class_ref (GTK_TYPE_ITEM);
+      g_type_class_ref (GTK_TYPE_MENU_SHELL);
+      g_type_class_ref (GTK_TYPE_NOTEBOOK);
 
       /*
        * We listen for event_after signal and then check that the

diff --git a/modules/other/gail/gailtoplevel.c b/modules/other/gail/gailtoplevel.c
index 0284a9df5b9f88b76e28fc6d201066410d442128..5d793e061c864d4b08ea9a2e5df1a1143743390f 100644 (file)
--- a/modules/other/gail/gailtoplevel.c
+++ b/modules/other/gail/gailtoplevel.c
@@ -110,7 +110,7 @@ gail_toplevel_init (GailToplevel *toplevel)
         }
     }
 
-  gtk_type_class (GTK_TYPE_WINDOW);
+  g_type_class_ref (GTK_TYPE_WINDOW);
 
   signal_id  = g_signal_lookup ("show", GTK_TYPE_WINDOW);
   g_signal_add_emission_hook (signal_id, 0,